auto merge of #775 : alexcrichton/cargo/issue-771, r=brson

The examples output directory was accidentally taken into account twice, and
this removes one source of the output directory confusion.

Closes #771

diff --cc src/cargo/ops/cargo_rustc/context.rs
Simple merge

diff --cc tests/test_cargo_test.rs
Simple merge